Last bit of minor code cleanup for now