Re-factor and fix rs-describe-instances.