Fix new compile-time warnings with new GCC (Synergy, cbfc2de)

The new version of GCC issues some warnings where the old one didn't, so make some tweaks to ensure warning-free builds.

Signed-off-by: Greg Hurrell <greg@hurrell.net>