Merge "Properly passing an unused variable through."