Merge "Clean up post-opt passes, perform only those we need."