(Fixup) optimize binding values for some cases.