Remove functional approach and rely only on definition objects

[kjellmorten]

This allows us to do a lot of performance improvements and we can also remove the extra function call in operator(def)(options).