Misc. fixes for the Oracle / Sun compiler.

A few pieces of code have some ambiguous type deduction that seems to
resolve correctly for most compilers but not for the Oracle compiler.
This makes those few instances more explicit.
Merge topic 'suncc-fixes' into next

97b65f81 Misc. fixes for the Oracle / Sun compiler.