WIP fixed up the compound-hint case

and added some rather tricky tests for it