Limit when the new logic applies, to fix cases like one-line-scope