Undo the hackyness and use monadic binds like a pro :P

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