Set up internal data structure more correctly.