[Bug 6171] Kill or fix K&R support