GUAC-969: Fix defects from recent static analysis.