Remove references to a variable that no longer exists
Fix a SEGFAULT on ARM that only happens when the optimizer is on
(and cannot be reproduced on Intel or AMD x86)