[builtin/bracket refactor] Simplify code, and add spec test