am 87662da8: Merge "Quick compiler: reference cleanup"

* commit '87662da8f55e3a21ac8f4f6d970035708c933c0b':
  Quick compiler: reference cleanup