improved Grid iterator efficiency/simplicity