minor code improvement

`Any` was being inferred here, causing the 2.11 compiler to complain.
old code still worked, but new code is better anyway.
Merge branch 'headless' into scala-2.11