SCHEMA-234. code style fixes.