Applied #73 to thymeleaf-spring4, minor code style modifications.