Some changes to remove TODOs. #89.