Merge "Mechanical code clean-ups in MSG_UNBIND handler."