Fix cfg warnings

This converts old style cfgs that generate warnings during `make check` to the new syntax.