Cleaning things up in prep for ScalaJs runner

Signed-off-by: Ben Jackman <ben@jackman.biz>