Linux porting: another clean-up