I promised an update. I just completed my federal and state taxes without any more issues.
It looks like @yrn 's solution works perfectly.
