Move some more less frequently used cruft out of the way.