Don't suggest after | & or in comments

Fixes #1631
Clean up variable expansion, and properly handle embedded NULs