Remove support for inner swap_handler
Add integer guards around Enum.fetch/2