Nevermind, messed with this a bit as well and using set adds/unions doesn't make it cleaner.