improve on bad code

call the callback instead; it's the right thing to do
bugfix or was this by design?

Either way now I want it like this
ugly dangling indents
nicer code