Editor: Better handling of json models.
Editor: Minor clean up.