Further cleaned up key support.