Minor cleanings in code.