Upgraded to non-recursive make format (again)