Refs #104; DRYer and easier to follow option implementation.