Minor style adjustments.
Fix whitespace.
Only match one ? at the end of an optional token.
Only consider the token optional if it ends with '?'.
Checkstyle fixes.
Mention Paul in the contributors section.