Changed parsing in the Shuttles module.