Tweaks to get tests running with various compilers.