Lots of cleanup#124

fingolfin wants to merge 1 commit into

mastergap-packages/guava:masterfrom

mh/refactor-and-cleanupgap-packages/guava:mh/refactor-and-cleanupCopy head branch name to clipboard