Never mind, kept polymorphism. Typing is now working. Next step is simplification.