More TypeApp handling fixes and cleanup