Cleanup / simplify / consolidate some things.