Factor out status to use Option<A>

Signed-off-by: Ricky Elrod <ricky@elrod.me>