Initial revision for irony-mode