build system churn + removal of old RCS keyworks. No actual visible changes indended.
Sync with Markus Kuhn's repository.