Updated to reflect changes to how arbitrary terms are typed.