Moving legacy calc_id to EntryMetadata instead, and some cleanup

12 jobs for refactor-calc-terminology in 36 minutes and 41 seconds (queued for 10 seconds)