Minor improvements to UASWaypointManager.cc

See commits for specifics. Pretty benign changes.