Fix warnings unearthed by #579