MF050 r1207: General code clean up. This should not include any functional              changes.
MF050 r1207: General code clean up. This should not include any functional
             changes.

patrickhartling/vrkit,patrickhartling/vrkit,patrickhartling/vrkit