Fix scoping issues with "no autodie"