Re-added subkind to Glossary, clean-up of Binding.js and Object.js