Removed proc optimizations, because the methodology is all wrong, and it causes problems in some advanced cases.