diff --git a/src/AbstractShaderProgram.cpp b/src/AbstractShaderProgram.cpp
index f6c42240d..61e773700 100644
--- a/src/AbstractShaderProgram.cpp
+++ b/src/AbstractShaderProgram.cpp
@@ -72,8 +72,7 @@ AbstractShaderProgram::UniformMatrix4x3dvImplementation AbstractShaderProgram::u
 AbstractShaderProgram::~AbstractShaderProgram() {
     /* Remove current usage from the state */
     GLuint& current = Context::current()->state()->shaderProgram->current;
-    if(current == _id)
-        current = 0;
+    if(current == _id) current = 0;
 
     glDeleteProgram(_id);
 }
@@ -83,10 +82,7 @@ bool AbstractShaderProgram::use() {
 
     /* Use only if the program isn't already in use */
     GLuint& current = Context::current()->state()->shaderProgram->current;
-    if(current != _id) {
-        current = _id;
-        glUseProgram(_id);
-    }
+    if(current != _id) glUseProgram(current = _id);
     return true;
 }
 
diff --git a/src/Contexts/CMakeLists.txt b/src/Contexts/CMakeLists.txt
index 7a3fd095f..f11098375 100644
--- a/src/Contexts/CMakeLists.txt
+++ b/src/Contexts/CMakeLists.txt
@@ -72,7 +72,7 @@ if(NEED_ABSTRACTXWINDOWCONTEXT)
     install(FILES AbstractXWindowContext.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Contexts)
 endif()
 
-# GLX window context
+# GLX context
 if(NEED_GLXCONTEXT)
     add_library(MagnumGlxContextHandler OBJECT GlxContextHandler.cpp)
     # X11 macros are a mess, disable warnings for C-style casts