Keyword not found recommendations

For issue #888.
+1 for consistent headers. Bigger clean-up should obviously be in separate commits but small fixes like this are fine.