Minor fix to re-enable optional per default in non-strict mode