Fixes to make ``[instance:...]`` using an ez-master work.