Annnd yet more code cleanup.