Simplify.

Change-Id: I09e6963caeac32174d7dd19c16690b16fc81672f
constructors: Fix typo preventing extensions loading.

Change-Id: If40e685f622b15e055a3087c441fc0c332e7d7d3