Started fixing the mess I created with my embarrassing misunderstanding of how the unapply method should work.
Removed unsafe implicit conversions and apply / unapply methods.