Miscellaneous picosat extension cleanup