Add weirdo dependency checking to the new stuff