Refactor binder and perform more constant folding during the binding phase