The first line "handle_interrupthandle_interrupt => handle_interrupt" is okay.
But why is the second line that adds "RuntimeError" needed?
There are another "rescue => e" line after only three lines of that.
Anyway do not include mutiple topics in one commit, especially if you want to backport it.
Yusuke Endoh email@example.com