Minor changes to make things consistent.