This change is a minimal way of addressing #239.  Will port stable0.6.  See FIXME for possible improvement.  Note this nose removal mechanism could be applied independently of the calving choice.