(Fixes #837) Better checking for excluded files when individually specified

Description of problem is in #837