ahammett: minor clean up for completeness