A few misc cr related cleanups.

Also add test for computed columns and for count(null).