More scanner fixes

A few more spots similar to the other PR where the coffeescript around a `@peek` is incorrect... also a case where the logic for an `Error` needed to be structured a bit differently.