Removed macro defines of internal form functions