Tidies discharge flow.
refs #8