White space changes only plus explicit subst. of a #define.
Extra input validation + encapsulate audio return values + unwrap strchr and strrchr.