More work on as-needed problems

Signed-off-by: Justin Lecher <jlec@gentoo.org>