A little more refactoring of some compatiblity stuff before doing any major experimental reworkings of the code.