Typing improvement.