Moved non-ES functions to macroglex