Remove strlen() calls in favor of incrementation; fix return value; add place-holders for other cases