Cleans up enough initializers and clearly marks them as good/bad to declare issue 15 done.