Add self to function definitions to make Eclipse happy