Let's not rely on Groovy in spaghetti-core