Nice.  I've modified the WhisperOutput with this optimisation as well.