Comments and null-check for constructors.
Remove escaper.
Add missing Javadoc.