Fix up constructor function declarations

Change-Id: I68ec96b20da1603e5cafd31d620d8dd54306627a