Added word boundaries, fixed up asserts a little more.