There is another bug resulting from this work. You can no longer edit a categorized answer since the 'editinvote' element no longer actually allows 'edit'. Adding an "edit" link will not solve this particular problem because of the hokey way CatQ+A was implemented (an "edit" link would just send you to the "Permission Denied" page).

Note even the new option at the end of display settings works around this problem.