Minor cleanup and recompile.
Minor cleanup and recompile.

google/CodeCity,NeilFraser/CodeCity,google/CodeCity,NeilFraser/CodeCity,google/CodeCity,NeilFraser/CodeCity,NeilFraser/CodeCity,google/CodeCity