Fix macro generations in StatementComm