clean up token sub-spec somewhat