Some clean-ups for the sake of code reduction.