Little more work on portability.