Tiny 2.1 EA1 SQL Formatter Bug?

Question

Not really a big deal and probably nobody cares about it, but once you use a query prefixed with a WITH clause, all subsequent queries are indented.
Here's a quick formatted example. I was expecting query 3 to not be indented.
-- QUERY 1
SELECT * FROM dual;
-- QUERY 2
WITH src AS
      SELECT * FROM dual
  SELECT * FROM src;
  -- QUERY 3
  SELECT * FROM dual;

Answer 1

On a similar note, how should i expect subprocedures/user defined types be indented inside a stored procedure? I would expect them to look something like this:
CREATE OR REPLACE
PROCEDURE p1
  TYPE my_type
  IS
    TABLE OF PLS_INTEGER;
  PROCEDURE subp1
  AS
    PROCEDURE subsubp1
    AS
    BEGIN
      NULL;
    END subsubp1;
  BEGIN
    NULL;
  END subp1;
BEGIN
  NULL;
END p1;But subprocedures and types don't seem to be indented.
CREATE OR REPLACE
PROCEDURE p1 TYPE my_type
IS
  TABLE OF PLS_INTEGER;
PROCEDURE subp1
AS
PROCEDURE subsubp1
AS
BEGIN
  NULL;
END subsubp1;
BEGIN
  NULL;
END subp1;
BEGIN
  NULL;
END p1;