> I believe this also applies to your comment above (line 78)

Yes. Those are related.