Minor cleanup of ufuncs.
Add scalar types.