Another stab at platform detection, refs #94