utils.* is now used everywhere
Merge pull request #495 from syranide/fixutils

utils.* is now used everywhere