Adds hack to allow defining thunks