Refactored CONSTRUCT_INTERFACE_ macros