Rewrite resolve model to be based around generic.consume, instead of
using all, which was generic in a way we weren't really using.