Fixes after Łukasz review part 2 - bonuses for using type-safe IDs.