Registry to simplify closing listeners
Test watch changes to library code too