better bailing
manually expand syntax to remove dependency on helper macro