Tidies up def/var and import highlighting