Libmarpa refactoring: t+