Further refactoring toward parseAirtime. Refs #8