A few post-merge cleanup items

Just some minor code movement and fixups