Support for zero size C apertures and fix parsing of ADDNN<macro-name>