Utility: minor cleanup.