More sample cleanup...
HolisticWare.Porting helpers added