Simplify a couple things that no longer need to be so complex.