Some more work on the DatabaseRParser internals