Drop support for Nothing and the Scalar argument and update tests. Rename stuff and update documentation.