Refactor launcher / interceptor disc code.