Resolved some review comments I had previously missed.

AFDP-32