Use default method impl for `swap_r`
Use macros for Point impls
Make macro syntax clearer