Change some vars to vals; reorder some methods.