The lurking suspicion that something could be simplified ...