Update for language changes
De-implicit-self