Small improvements for own previous request #17.

See commit messages for detail.

I'm not sure if "GLSL" and "Cycles" also should use the display device "None".