start of fixes and prep for IDSgrep 0.5.1 (sigh)