Update for HaxeFlixel/flixel#1099 + minor cleanup