No longer assuming .makomi within sourcedir when loading