Clean up extension inclusion

Also restore SemanticForms extension.

Change-Id: Id00caf28c2e4cc03040d3d5d0af0bd671d163a92