Optional optionals are scary.
Merge pull request #12 from jordandukart/7.x

Optional optionals are scary.