More cleaning of macromesh.c