Simplify ReUnit implementation based on feedback from @travisbrown