hwaf-gen-lcgcmt: some more reorganization