Model: overspecify some types to evade possible ambiguities in future

Subject. :racehorse: