Minor cleanup in prep for tile pull calls.