More small cleanup for #60