Resolve two trivial TODOs.