Preparing for the move to SQLAlchemy 0.9.x