Clean up to "Biolithic Drupal 7 Meta 1 #132 from 12 10"

Cleaning up @biolithic's PR at https://github.com/backdrop/backdrop/pull/102.

Fixes several issues from https://github.com/backdrop/backdrop-issues/issues/132.