Refactoring libmarpa: t+