builtin-push.c: Cleanup - use OPT_BIT() and remove some variables