mrq-max-attempts: Fixes from code review