Apply fixes for Christina's code review comments.