am 6cc763c8: Merge "Quick: Clean up slow paths."

* commit '6cc763c8b8157fb42dd44e1dfb84812546500dc1':
  Quick: Clean up slow paths.