Improves return values of def.*