I'm not totally happy with these, but I don't see a much better way to get them under 80 chars. They're only a few over, and might be more readable if we reverted and allowed that.