Tighten up opening and closing

Per @cakey in [IRC](https://botbot.me/freenode/gittip/msg/4555032/).
Smile!