I agree this needs to go somewhere else ... still need to think through it a bit more as to where would be the best place.  Doing STI for different types of keyframes doesn't seem like the way to go, but I'm not sure what is.