Group opts.holepunch-option processing together for clarity

[HDegroote]

This way the contract of opts.holepunch is clearer from the code (that it can be either a function or the boolean false).

The disadvantage is that the public/private properties are no longer grouped then, but I think it's clearer this way. Feel free to close unmerged though