Refactored defexpr, defconst using the elaborate function.