Began to move option subclasses to common.