Numerous minor improvements redux.

As ever, a bevy of new FIXME comments direly litter the codebase. Someday, we
shall begin on a langorous journey to address them. For now, they continue
spawning their ill seed like maggotty code worms.