port to support changes to ExtLib.