Close GH-56: Gulp intermediate rewrite, fixes 53, 54, and 55.