Update based on review feedback.

@ADmad caught a pile of mistakes that I missed.