Cleaning up link generation to be strongly typed, and to be less verbose