Address several TODO-s
Implement recursive calls via @, @@, etc.