Change with-slots to with-accessors