Merge improved utils into master.