Merge "fd_utils: address a couple of TODOs."