Issue 653 - Object.defineProperty instead of defineGetter / defineSetter