WIP: Simplify windows/non windows checks