Drop defineProperties where it's possible