Merge "Cleanup interface initialization code to create fewer scopes"