Fix up the instance-declaration re-engineering story