This was very helpful and it makes sense. However, I still have some doubts since I haven't been able to find any resources online that deal with this (could be that my googling skills aren't that great- but I digress). Could you please tell me what you are basing your answer on (when you say they should have been deducted w/ 2016 return)? If you could provide online links, that could help too.
