Cleaning up the architectural hooks. Patching a kicad bug that -debug complains about at launch time.