Minor semantic tidiness