A small number of changes to streamline code and to wrap up today's changes.