GUAC-607 Fixed up a few last things for code review.