ESSENTIALS-250: rework to make explicit setup phase work for blog plugin, plus lots of clean-up.