Refactored the bean code, pushing it all down into the Client where it belongs. Also used the flag now available on BeanManager from jmx-bean-management to control whether the beans code is activated or not.