Implementing recommendations from code review, fixing test breakage.