Continuing to play with and refactor link-generation & representation code.