Macrosyntax polishing (KS v.1.2)