Fixes for bugs/warts found in debug mode compile (bug #17092).