Merge "rdbms: avoid strange uses of empty()"