Resort to WAYLAND_DISPLAY checks to avoid X11 connections

Same reasoning applies (Opening and closing X11 displays may be from ineffective to harmful there), but the XDG_SESSION_TYPE check breaks for startx.

Explicitly check for WAYLAND_DISPLAY to avoid this behavior.

Pointed out at !12 (merged)