Refs #70 - Make service definitions more succinct.