Tidy up a bit.

Refs openhealthcare/elcid#350