Wouldn't it be better to avoid inner context classes, because of #129?