Merge cleanup code from Brian N.
authorBrian Norris <banorris@uci.edu>
Tue, 16 Apr 2013 00:09:53 +0000 (17:09 -0700)
committerBrian Norris <banorris@uci.edu>
Tue, 16 Apr 2013 00:10:32 +0000 (17:10 -0700)

Trivial merge