Groovify the source more.