Organise inner class matchers to be nearer to where they're used.