CODE: Preparatory changes (mostly comments/style) for proper calibration of jobs/population and separation of the two.