Remove more X-specific stuff.
Handle opacity correctly.