better bareword handling