+act #3770 Make the FSM types play nice with Java7+