Fix @limhoff-r7 feedback

Hi @todb-r7, this pull request tries to fix the @limhoff-r7's review of https://github.com/rapid7/metasploit-framework/pull/2609