Reverted message().  `current_message` exists.

  D'oh.

  The code I added & reverted was cleaner though; so replace
 the implementation of `current_message()` with it.