Used the WithCodeLocation helper in more passes. This cleans up some code and should improve efficiency.