Merge "preen should work independently with alwaysyes and alwaysno."