Removed dependency on experimental 'when'.

Just creating problems with warnings.