Issue #1995008. Fix price calculation with options.

Fixes https://drupal.org/node/1995008 and probably https://drupal.org/node/2089125 too.