Slight cleanup / optimization for #1084.