More stds compliant.  VS doesn't like non constant length local arrays.