Merge  #1628 and build again

Rebase wip/no-blankies to current branch
Yeah, code like this makes me think the exposed refactoring API may be off... (`List[List[String]]` instead of just `List[String]` seems an artifact of sbt's implementation)