more idiomatic without and tokens impl