FIPA-SL grammar cleanup