Update to 3.3.1 and simplify API.