Done with making it possible to run very long simulations (closes #391).