Added fully qualified names where necessary for compatibility with
ExtLib.