Resolved serial timing issue in earlier C++ refactor