Make use of Java7 features.
Refactor to standard formatting.
Add original author's interpretation of Future Planned Feature #0.