Fixes some problems with ordering of implicit component stack removal noticed during table testing. Still need to add relevant table tests.