Fix syntax errors due to ripping out D2

Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>