Fixed #645 -- corrected defined? ::Constant