Tweaks for #1600
Quick option order tweak for register_post_type