Small tweaks to remove circular reference on simpMessagingTemplate