Improved Effective Capacitance Computations for Use in Logic and Layout Optimization