Fixed new design to pass most of the tests. Still doesn't work with nested wpl_alloc calls.