Clean up unicode helper.
Clean up utils.
Update specs to new syntax.