main: Refactor frame handling, makes semantics clearer.