Small refactorings + method context fix smalltalk->st