Clean up ConstantScoreAutoRewrite, fix merge