fix: resolve legacy hypatia findings at source; de-baseline (99 → 59)

fix: resolve legacy hypatia findings at source; de-baseline (99 → 59) #280