Merge small LESS refactorings.