Rework usage of macros and use macros defined in the meta package
Remove some compatibility artefacts