Bug fix and optimization: in SWI we don't need the /1 trick, we can resolve the module earlier.
Fixed issues with swi messages