Small changes, mostly code cleanup.