Integrating changes to embxx.