More work on row generation. -Chaz