Remove defer calls in small functions.