This move more than halfs the size of this file, and makes it *much* easier
to understand.  If we ever need the gradient code we can still recover it
from the 2.3-2 branch.

[[Imported from SVN: r9650]]