Tidy platform common bits in diff

Signed-off-by: John Howard <jhoward@microsoft.com>