Revised everything up to (but not including) section 3.