This should simplify the API for the consumer. It removes the need to keep track of the underlying Database for a given prepared statement. It also renames the API for consistency.