Remove another lurking kernel class argh, address a code review