Remove spl*() calls from the bus/ infrastructure, replacing them with