SONARPLUGINS-2351 Grammar: improve support of types