Improve selector and conditional for no-arg signature text