Encapsulate fields (issue #2).