Fixup all lingering instances of old style expansion
Swap defined(sun) for defined(__sun) which is apparently defined in more cases