Potentially update to 1.7 - yet to be tested. Next step is CI.
Refactor mod_LibShapeDraw, and replace NullList/Map with EMPTY_LIST/MAP