Changes API to ensure a more sane memory situation.