Cleanup syntax for strict-mode