Align with alf-core.