More changes to switch to PDO.