Merge "Optimizing: Clean up constant location handling." am: fe0ec35c68 am: c080a0964f
am: 51a13eb601

* commit '51a13eb601ae7b9c6a2a3ab8aeda9a7cc27e6b0b':
  Optimizing: Clean up constant location handling.