Use the es5 defineProperty mapping on the Modes module
Remove helper methods