Reverted abbreviating types; less obvious what it means.