More magic method cleanup for gh-192 @wip