Fix parser type safety for stricter AST types (#255)

Fix parser type safety for stricter AST types (#255) #587