Improve transparently handling key schedule.