misc cleanup, more usage of internal methods for receivable/broadcastable detection