Switched TBB filters to used Lambdas. Code is inline and much cleaner.