This would be so much nicer with waitstate support in the core ...