a/j/konami: Some code cleanup.