I don't see it as hackish, but I don't mind the state machine either. Fixed in #324.