Improve concept slug generation to avoid dodgy slug conflicts.

Additonally, remove a use of null in favour of `Optional`.