I don't mind this change, but it'd be cleaner to have it in a separate PR from the error.spt change.