Fix remarks by @ned21.