2013-spring-cleanup: diff-patch cleanup.