Assorted Gradle cleanup and utility changes