Add some validation to the various macros