Some random fixes to stop code from shadowing builtins.