Convert the fill_buffer to a class method, to allow accessing the private method.

Also remove the leftover Wrapper stuff.