Merge changes I30fab9e4,I1210ee69

* changes:
  s/^I/    / ...
  Add nice skylark wrappers to abstract changing based on compiler etc