This is already quite a big pull request, so I did not want to unpick this right now. It is not directly related to what I am doing, but it is really ugly. Configured blocks should be put in where they are needed, not filtered out where they are not.