Simplify OS matching