Fix spec errors when running against a combined file with debug code removed

Noticed while reviewing another pull request.