Remove IWatchable interface
Extract has-key function