Address cleanup-related comments from a previous change.

See http://reviews.vapour.ws/r/493/.

(Review request: http://reviews.vapour.ws/r/520/)