More clean-up/tighten-up of code.