a little more kernel consolidation