Simplify generated paging SQL for SQL Server.  Update unit tests to reflect new output