[Fix #15] Fix Java 7 compatibility.

This breaks Java 6 compatibility since these are wrapper classes.

[Fix #15]