Kepler

I marked these two files with FIXME notes at r30698:
Log:
Add FIXME note to these files about duplicate code that should be factored out. Marked the 3 duplicate methods that I saw with FIXMEs too, though there may be more.

I'm punting to 2.5.

Original Bugzilla ID was 5652