Portability part2

I'll remove it even though the original is much less readable to me.