@Wallaby my mistake on the details but the general thought process is still holding. Here is the instructions for 2018 which clearly states the income limits for the filing years post 2008. You are correct, this is messy.
-------> 2018 Instructions for Form 8854 (irs.gov)
pk
