More robust source file detection...