Misc cleanups.
Added extra check to ensure subitems don't get invoked from concurrent queue.