Remove short-circuited skipping of empty content