Get rid of x val; use a type annotation to help the compiler
Merge remote-tracking branch 'origin/breaking-news' into breaking-news