First-pass fixes for HXSL 2.0