Fixes some memory problems, and a previous regression.

Fixes [this issue](https://github.com/wordpress-mobile/WordPress-iOS-Editor/issues/341) and a regression introduced in [this PR](https://github.com/wordpress-mobile/WordPress-iOS-Editor/pull/342).

/cc @bummytime