Removed use_truncation keyword, tidy up.