Removed Mark, more cleanup, comments on If assertion reasoning.