GH-8: Made album preparations properly deferred.