swirl: moar types
options: make mine a tagged tuple, please

- tagging data structures makes pretty printing them easier to read & format in tests
message: typo in types
message: refactor
refactor_handshake