Make {database,role}_check functions consistent with existing style