Follow up from #3132 See comment: https://github.com/MDAnalysis/mdanalysis/pull/3132/files#r629694435 We should be able to clean this up a little bit.