Cleaner code. Also fixes a bug when F or P directives didn't in fact
have space.
Signed-off-by: NJani Nikula <jani.nikula@intel.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>