Small cleanup items that I assumed were in for @jamalex!