Alas, more code cleanup.