DATAJPA-265 - Further polishing.

Original pull request: #50.