Miscellaneous Sensio-inspired cleanup.