Inputs and outputs tidied to keep DRC a bit happier...