Shorten names, normalize more arguments, normalize output.