Changes for latest upstream excon code.