Merge "Make slow paths easier to write"