Test against the window_type() too.

  This should avoid even fewer collisions.

  This updates #3.