Merge "DatabaseMssql: Don't duplicate body of makeList()"