Perf: only set bindings when necessary
v2.1.0