finish up simplifying subscript parsing