A bit more cleanup to prevent BaseNode from becoming a mess