Minor reordering of methods.