Function and Variable highlighting are fixed.