Minor code cleanup.
Version bump to 2.1.1.