Avoid doing the 2nd pass twice at the top-level

Thanks to Eric for pointing this out.