Item 25 - Consider support for a non-throwing swap.