Use long-form state declaration
Combined multiple extend statements

Fixes #22