Addresses errors reported in gdg-x/generator-boomerang#5