Fix Trac #3095, and make RdrHsSyn warning-clean