Avoid inlining return blocks and add clinit test