Simplify #if blocks a little

Change-Id: I2867917e02ef808e4f74175bc146fcbb9bcba7be
SAL_OVERRIDE, Mac OS X vcl redux

Change-Id: I25f2a79efff7b77651f7cd6c658269e9411c3bdd
Work around MSC "'override' cannot be used with 'inline'" bug

Change-Id: I4aeccc3957048a40e705654bf6b9972cc03648b6