Fix while simplification and implement it's instrumentation