Need 2 more casts to make this fully happy (weird - this build stand-alone on -current and 9.2-release)