Partly completed move to support Hakyll 4.2.2.0