QuickFix for OVERRIDDING_FINAL_MEMBER

Previous attempt: https://github.com/JetBrains/kotlin/pull/218

I fixed the issues you pointed and reviewed my code more carefully this time...