replacing dodgy land accessors with nicer alternatives