Remove references to blocks and typedefs.