Why do you remove the ``MAX_ORPHAN_BLOCKS`` constant, it can be used so we don't get back a magic value again. Also you should use it in the description of ``-maxorphanblocks``, see ``-par`` on how do do that.