Couple more byte beats (one's not perfect), plus JSON version