Hello,

From a quick discussion on IRC I've decided to contribute the
following two patches. The first is stylistic but the second is
something that was requested. Note that I've already assigned
copyright to the FSF for my contributions to Emacs.

Regards,
Nikolaos Chatzikonstantinou