Clean up build.gradle somewhat
Generify Value and Expression types