Removed more pre-modularisation cruft.