Refactor
Remove the no-return-value optimization until I have numbers