Fix some classes having members that were unintentionally static, causing their object-orientation to break and keep stale memory around