improve token helpers to accept token.value instead of callback. closes #61