conditional compilation from Mark Horton to retrofit signals