Unify toolset state handling in module