Replace ad-hoc fill rectangle by fill_rectangle().