This section is looking quite anaemic. Perhaps we could inline occurrences of the two remaining aliases.