Fixed dangling references due to missing decay + cleanup.