Make it easy to not use intent probabilities

Currently all the new code has to support the intent probabilities. This requires thinking about correct probabilities and marginalization all the time and just makes the code complex. We should make the core easier to extend, possibly by dropping support of these probabilities.
