Indirection handling, codegen cleanup