Removed some redundant calls.
More work on the demographic model.