Tentative fix for #888: compiler warnings
Concerning #892: more reversions to ExternalFunction