Refs #119 - Use strings where appropriate.