Looks like you got carried away with search + replace. I'm seeing several of these in this PR.