Speedups; see ChangeLog for fine details.