Simplify return status

Fix some things I didn't understand due to Martini confusion and also
being bad at writing function signatures properly.