NOREF: Cleaning up some syntax warnings