I agree we should make our modules re-entrant.