Separate dist/local trap wrappers