Minor internal improvememts.