Better hook-ins to xmodules.