Improve platform-handling code after feedback from @borntyping.