Made normalization conditional, to avoid errors with empty-call renders
More reshuffling of example files