HEAD is now at 0da97ee Second round of scaling analysis commits. This is still only partially complete: this restores some earlier work. 0da97eef17ca8e805541ff1c448b92ddf3751dad