Cleanups (pxt.cpp/sound.cpp)