as well as reducing fairly mechanical (as far as I've been able to see) code duplication floating around the various subsystems