Make this a little more robust for byte-compiling without auto-complete.