Break java-env out so it doesn't require tagging of the tree