BBI cleanups, got rid of maybeCreateFeature.