Properly respect option values.