Minor backups cleanups.

These are changes that should have been in earlier patches.

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