Make detecting the features supported by the remote entity less awful

no more stalling while waiting for a disco info while sending a message.