Replace still more end-of-line etc with line-end-position, etc.