Content View: definitions refactor, unit tests

Think we've got a good ratio with "-"s representing simplified logic and "+"s being many unit test additions.