(GL) Some further cleanups