Working on #213, trying to make more things final (for eventual immutability)