States; fix null enter param (thanks @whuop) and add remove leave_with convenience