more idiomatic without and tokens impl
Merge pull request #3 from kontulai/patch-3

more idiomatic without and tokens impl