Fix bug in commit a4c39d94.

Need to handle x-expr with no attributes, like before: `(pre ,s)`.

Also:
- DRY pregexp.
- Use \\s* to allow zero or more spaces after "Title:" and "Date:".