Improve portability, hopefully.