Or-token, slight cleanup.