r8108: Fix indentation, and remove a discard_const_p() that we don't need any more.