Add better support for @row special.
Add test for @row special.