JWS-17 re-design behaviour of Option.toString