Adding correct guards for initializers.