Small cleanups to Patient Builder code