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

* commit 'fe0ec35c68d57205bd8fe13bd195ae0b5a3ed180':
  Optimizing: Clean up constant location handling.