RC1: Clean-up Embedded Database API.