[PATCH 1/2] Remove surprises from X startup.