Minor adjustments to is_rightholder function