am 83a9962f: Merge "More compile-time tuning"

* commit '83a9962f4062cd91e823a2a948aba3887cbe32aa':
  More compile-time tuning