More Heimdal portability cleanups