Some cleanup changes after taking another read through the documents.