Slight code cleanup.

AFDP-112