Squashed commit of the following:

commit c3e88212ff666701b5aca3cbc96b557fa37aa682
Author: Shawn Routhier <sar@isc.org>
Date:   Wed Aug 24 11:33:31 2016 -0700

    [rt42984] Clean up some memory references