Simplifying internal mass handler removal API, part of #241.