2013-spring-cleanup: coding-style cleanup.