p2p: Revamp the options pattern

[Wondertan]

We do this to make a single option usable in different contexts, but it's ugly and error-prone. Think of a cleaner way to accomplish the same goal.