Indeed :) But I think you should pop it from options too.

Thus : 

`` model_name = options.pop('model_name', None) or properties.pop('model') ``