Remove more cargo culting

Elixer pattern is still probably wrong, but at least is no longer a
blind copy paste job.