Just some refactoring, no code changes
Fixes more or less: https://bugs.freedesktop.org/show_bug.cgi?id=67474