Small design change: Remove support of alternative way of using the classes.