Whoops, didn't quite read that pull request.  That was meant to use the object properties.