Include scalar case. This addresses #212.