Simplified some dependency code using lazy validation.

Signed-off-by: Andy Dufilie <andy.dufilie@gmail.com>