Fixed #9746. Deleted workarounds for old SUN_CC compilers, those are now unsupported.