Cool, opened up JAVA-306. I'll remove the comments here.