Powers of Entry etc. Bill [HL]

I have one question for the Minister, which I suspect he will not have the answer to at his fingertips. As my noble friend has explained, there is evidently considerable confusion about what powers of entry lie on the statute book. What concerns me is that there are a number of non-departmental bodies, as I understand it, that have quasi-legislative powers in their own right. For example, if I remember correctly, the Financial Services Authority can legislate in its own right to give itself powers of entry. My question is whether those sorts of situations could be contained within the schedule. Failing that, would the inclusion of the Financial Services and Markets Act within the schedule cover that eventuality?