Clean up super()

Remove extra super calls
Only use super() code path if a method has a super() call in it
Replace string.indexOf() with regex matches
[Delivers #84085700]