Did a bit of work to improve portability.