Speed up expression statements.
Speed up expression statements.

Also fix highlighting in demos.

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