Fix: findFor was still using the old getContext return signature somewhere and thus failed to get the actual context objects.
Improve file finder. Various fixes.