WYONE: very minor bug fix for error message.
Merge branch 'devel' of github.com:DavePearce/Whiley into devel
Merge branch 'devel' of github.com:DavePearce/Whiley into devel
WYCS: beginning work on WYCS
WYCS: some reshuffling.