When removing a file, correctly resolve files that aren't directly in the WORKSPACE folder. Fixes #1778