A few preparations for Atom 5.1.  Start removing old hacks.