Move __owner__ off of props

(With #573, the tests pass.)