Minor tweaks to current IPC system (fixes #5).