Simplify handling applyMaps deferred.

Fixes ZEN-12397.