Be more explicit about bindings we do not need, and tweak horizontal whitespace